Merged from gtk-2-4:

2004-11-20  Federico Mena Quintero  <federico@ximian.com>

	Merged from gtk-2-4:

	* gtk/gtkfilechooserdefault.c (list_icon_data_func): Set an empty
	icon if we are on the editable row:  if we don't set the cell
	renderer at all, it will reuse the last thing it painted.

diff --git a/ChangeLog b/ChangeLog
index db8c867512381fe00f2fad11a07dd79d5c986d25..e6ac7b2755040085e31670f3b7d2b5bf65ae661e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-20  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-4:
+
+       * gtk/gtkfilechooserdefault.c (list_icon_data_func): Set an empty
+       icon if we are on the editable row:  if we don't set the cell
+       renderer at all, it will reuse the last thing it painted.
+
 2004-11-19  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-4:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index db8c867512381fe00f2fad11a07dd79d5c986d25..e6ac7b2755040085e31670f3b7d2b5bf65ae661e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2004-11-20  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-4:
+
+       * gtk/gtkfilechooserdefault.c (list_icon_data_func): Set an empty
+       icon if we are on the editable row:  if we don't set the cell
+       renderer at all, it will reuse the last thing it painted.
+
 2004-11-19  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-4:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index db8c867512381fe00f2fad11a07dd79d5c986d25..e6ac7b2755040085e31670f3b7d2b5bf65ae661e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2004-11-20  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-4:
+
+       * gtk/gtkfilechooserdefault.c (list_icon_data_func): Set an empty
+       icon if we are on the editable row:  if we don't set the cell
+       renderer at all, it will reuse the last thing it painted.
+
 2004-11-19  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-4:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index db8c867512381fe00f2fad11a07dd79d5c986d25..e6ac7b2755040085e31670f3b7d2b5bf65ae661e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2004-11-20  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-4:
+
+       * gtk/gtkfilechooserdefault.c (list_icon_data_func): Set an empty
+       icon if we are on the editable row:  if we don't set the cell
+       renderer at all, it will reuse the last thing it painted.
+
 2004-11-19  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-4:

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 6ca67556df8560fbe1b0a7bfab5740927e273f68..a1317483565e423fa3ed81821efa41581e70936a 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -5553,12 +5553,18 @@ list_icon_data_func (GtkTreeViewColumn *tree_column,
                                                  &child_iter,
                                                  iter);
   path = _gtk_file_system_model_get_path (impl->browse_files_model, &child_iter);
-  if (!path)
-    return;
 
-  /* FIXME: NULL GError */
-  pixbuf = gtk_file_system_render_icon (impl->file_system, path, GTK_WIDGET (impl),
-                                       impl->icon_size, NULL);
+  if (path)
+    {
+      /* FIXME: NULL GError */
+      pixbuf = gtk_file_system_render_icon (impl->file_system, path, GTK_WIDGET (impl),
+                                           impl->icon_size, NULL);
+    }
+  else
+    {
+      /* We are on the editable row */
+      pixbuf = NULL;
+    }
 
   if (info && (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
               impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))